Revert d720c9d..873d3f0

This rolls back to commit d720c9de40d97ec5090da1169ffaa055f7f1a18a.