Revert 627e782..f813baf

This rolls back to commit 627e78274a7304b6e38fb91ee057f0bfbe312ef5.