Revert c4984ef..b411f1b

This rolls back to commit c4984ef12f761aef7efcfbd5c2c63ccbbf88c394.