Try just changing package_dir and reverting other changes