This reverts commit b190df6e
merged
mentioned in commit 3f9684a6
This will create a new commit in order to revert the existing changes.