Remove workaround for problem that was since fixed upstream