Revert c04c7b5..368f881

This rolls back to commit c04c7b57906c770dcddaf358fb51576553d52cf7.