Revert c016712..576e5e7

This rolls back to commit c016712f19ef8d330ed9d4a9cec83845c72fe716.