Bug 1048022 and Bug 1043032