[12488] Revert previous commit (see Notes)