Rollback of c280ee8