Advisor still working now, revert to this commit.

If everything breaks on the packageFix branch, this branch should still
be stable.
i think merge is fixed?