Bug 895231 - Make sure the Components shim is consistent with the real Components. r=bholley