Revert aafae5a..bd5446d

This rolls back to commit aafae5a8df8d47bf3f08e007eb675cde72f55a42.