This reverts commit 590d1c73.
mentioned in commit 358b7617
merged
This will create a new commit in order to revert the existing changes.
