Backed out changeset bae32cf47dec (bug 988882) since it seems this breaks debug-bc tests