This reverts commit 18117e1a.
mentioned in commit 94a6cf49
merged
This will create a new commit in order to revert the existing changes.