a1536c2876
This reverts commit 38b946c2762d10f547de3e6c2b0676d3f7dfbd54. See discussion on JIRA.
This reverts commit 38b946c2762d10f547de3e6c2b0676d3f7dfbd54. See discussion on JIRA.