Rev 425 changes:
* Fast fix for stargate config.