see patch
Created attachment 65182 [details] Patch
It looks good to me. I am going to land this as a build fix. Thanks Patrick!
Committed revision 65866.
Comment on attachment 65182 [details] Patch Removing from review queue.