Rollback of e60851e