Revert 9a3796a..d20446e

This rolls back to commit 9a3796abde962044adbd06898a70d147b8a72c51.