Re-do Derek's commit since I screwed up and lost it.  His commit: https://github.com/camsys/oneclick/commit/a2133dc53c27a8f18a534530b42eed57709f7d9e [#62638610]