Revert 9ad0ae4..caa3c25

This rolls back to commit 9ad0ae4cd4a5f508bd5816a3b6f3d3f30e28ffd4.