How can I stop Xcode 3.2.6 defaulting to the iPad Simulator? Is this new behaviour?

It seems like every time I launch an Xcode project or 'Clean all Targets' the Active Executable resets to the iPad simulator.

Prior to the Xcode 3.2.6 release Xcode was defaulting to the iPhone Simulator or remembered my previous Active Executable... I've never noticed this behaviour because I generally do iPhone work. This has been bothering me sine the latest Xcode update (iOS 4.3 release) and is really irritating.

Similar questions/answers suggest setting the 'Targeted Device Family' of my Target to 'iPhone' - this has been done.

Is this new behaviour?

Is there anyway to change the default 'Active Executable'?