Bug 1087370 - Unbreak build on non-SPS platforms after bug 818307. r=aklotz