Implemented a basic fix for BZ#1117066 - Overlay is hardcoded to use prod server.