Revert 9b095d9..9598808

This rolls back to commit 9b095d9007c4c636d55ed3e41e1fd0b91db8e469.
test