Revert 8bb820b..9181d77

This rolls back to commit 8bb820b39a1321389ebf2e85aaf6a0b7e79b3906.