This reverts commit 40ec3444, reversing changes made to d8d2bb9c.
This will create a new commit in order to revert the existing changes.
