This reverts commit e92a147e1961366e36a39577816994566e1e21c5. This is a revert of a revert -- i.e. a restore -- just so I can change the commit message to add the JIRA number.