backing out 4df2e13d4157 (bug 891993), to prevent build bustage from warnings in a 3rd-party .h file that'll be landing in Bug 837199.