References the wrong JIRA above so revert; also an addendum is on the way. This reverts commit 26ba621e47e886fb3b1336f2201b8efbda86ff91.