Revert d7dd230..5c0bd91

This rolls back to commit d7dd23046a60589551d3329fa768239366df253d.