I fixed this on head (before-install and before-upgrade both did not
work, although afaict the after-instantiate should be fine).