Revert c5ca142..68857fa

This rolls back to commit c5ca1428975f22b2bcee8d1bbb5d70312997385c.