This file needs to come out of this commit. This is organized in JIRA under GATEWAY-3371.