Backed out changeset 9a867e5a4ef5 (bug 895417) for suspicion of causing OSX asserts.