This is a revert of a revert, i.e., a reapplication only this time I'm pushing w/ the right JIRA number