Revert c081cf7..092a898

This rolls back to commit c081cf7959d77529531ec934466d80f601429016.