Merge "Partial rollback of I9ebc92dc"