Revert 57c04cc..cddc31c

This rolls back to commit 57c04ccda00e18461d5c0c4cc34278a354d5c1f1.