Opened bug 865355 with a pull for just that portion.

@steveck-chung 1b910f213b9ffcd6ff08487d77e044e6f0717f7a is this commit rebased on top of my pull #9388