This reverts commit e977b0ae59 for MR1. The original commit is only intended for N, not MR1.
e977b0ae59