As mentioned in my last comment, I would have very much preferred reverting to old code where the package is installed later on instead of adding all the hacks. Any reason you didn't do this?