Revert 60b9f8d..e4d6eaf

This rolls back to commit 60b9f8db18b8889c3db864e443ee113d897bfe72.