Revert fc1f660..0787808

This rolls back to commit fc1f660f585714fc6f9a435e75ff272234534125.