Revert d32898a..f9434dd

This rolls back to commit d32898a0ed76e36c70d0e6ae0827e97700f74420.