cherry-pick/revert: Use advise() for hints