We should no longer need the hacks now that the post-install task is fixed