Revert cfc9a04..5bae83c

This rolls back to commit cfc9a04ae760e4ac21269cbf1e5deb981fb23d76.