Revert fd5fec6..8d9d8e1

This rolls back to commit fd5fec6b176d60a6ab1196b85d7ac891fcb156b5.