Backing out bug 884796 HiDPI fix r=backout