I just came across a report that suggests the  National Economic and Social Development Board has told AOT to drop the current plans for Terminal 2 and go back to the original master plan.  If true, then certainly not much relief for Swampy for many more years to come.  [The original master plan calls for a large expansion terminal on the other side of the runways - sort of a mirror image of the current one.]  The third runway and a currently planned expansion of the eastern end of the current t