Revert 740ad9a..5f27303

This rolls back to commit 740ad9af2e754b8e4d981fff2944ba9992adf349.