b33c200a28
This reverts commit 558ee079fd04dfab8e61eca10ee98ab5bac89dfa because it was not tagged with a jira ID. Will be re-applied.