Revert Bug 1022368 - Kill some puppet masters in AWS