Comment 2 for bug 1753005

I have extracted this small fix from the omnibus branch and pushed it in, as I didn't see any dependencies with the rest of the branch. Also, this doesn't affect 3.0, so removed the target. Thanks, Galen and Mike!

I will also be rebasing the omni branch to account for this extraction.