Bug 546589: Revert custom target platforms changes
5 files changed