Revert 4f0be35..dd0025d

This rolls back to commit 4f0be3578819a2a7a3085f79d807209e2775c043.