Re-do Derek's commit that I screwed up.  Original commit: https://github.com/camsys/oneclick/commit/b9f649aa9f50522e61c091eb77ec6f1756f97f31 [#62803900]