My changes to address this issue are possibly contentious so I started this discussion:  https://groups.google.com/forum/#!topic/foreman-dev/HjTLaKraNrQ.

I request that we merge this to master without these changes.