Revert 7f53ccf..9be7e0c

This rolls back to commit 7f53ccf6900e4e1466162aa9fd2878cbee28d342.