Revert d8c84ab..2d40da7

This rolls back to commit d8c84abb04a5c425b3cd71f893fb30a2b9880a91.