Bug 1036509 - fix discrepancy between production and staging - r=bustage