No need to keep the patch for AWS in Alice, when we have it in the Grand Build System(tm).