Revert 6d88637..ade5a7e

This rolls back to commit 6d88637134d5c9b097bd2719dcc32da876bb89cd.