Bug 1037911: Bustage fix for -Werror rs=bustage