Add a temporary HACK to improve the situation with #289.