Revert 694c91e..7798fc9

This rolls back to commit 694c91e0190a984852c38a7ed664ffcc72275d86.