Bug 1105851 - Unbreak non-unified non-SPS build after 1054498. r=jcj