Solution 1:

As a workaround you can add && builtin cd - which is the bash equivalent of cd $OLDPWD

It has a disadvantage though: you lose the previous value of $OLDPWD. Personally I would find it very annoying and not a good solution for a command that's run often. I think in this case it's acceptable.

Hopefully someone else comes up with a better solution!