I haven't reviewed properly Simon's last patch. The attachment fixes the build.
Created attachment 11359 [details] Fixes the build
Comment on attachment 11359 [details] Fixes the build r=me
Landed as r17567