[[ Bug 13177 ]] Ensure MCswapbytes is correctly set for the servers