Revert to fix JIRA number; should be 20044. This reverts commit 92bb4db9ef367039029017aafe61c51f2c0181f9.