Revert f2d4d42..66389c8

This rolls back to commit f2d4d42baa19a3ae62c305c114703a35fc8d70f4.