Bug 1028049 - Unbreak non-SPS build after bug 990122. r=mhabicher