[12632] Revert previous commit (see Notes)