Remove hack from r154987. The problem persists even with it, so it's not even a good...