Backout 90d6f7ce0fc2 (bug 920935) not needed anymore (r=backout)