apply patch from lp#1210775