Merge pull request #15586 from jkotas/revert