Revert c1b0ee5..42ee4cc

This rolls back to commit c1b0ee52cf81fc633be909bcf162619c3e7654c8.