This reverts commit 4967505a.

This was creating problem with tinderbox..
changing the default base version on the fly is not a good idea anyway