Bug 812512. Backout 796a8d5e713d