Revert 4926e4a..aaeaef0

This rolls back to commit 4926e4ab6729c16961260d62716e67d1e854e335.