Revert 5a07374..8e9fc81

This rolls back to commit 5a073740f02bc06c9c692787f23d09e0a956f57c.