Revert c22eee7..f3a7bb4

This rolls back to commit c22eee743ed2132d8b196c126492205d929481ae.