We decided to leave this alone for the time being.  Once I have finished some other tweaks to this area of the code, I will fold it back into site.yml.