Reverting PR #3733 as we are in language freeze