Bug 872054 -- backout 57568a2 on master