Another quick hack to get back working packaging