A workaround for Bug#1182474