Revert 8dad5a5..75586e7

This rolls back to commit 8dad5a5c58cf68515a97c0a58bc13bea7183988a.