reverting previous hack to try and get things working on debian