Avoid dirty hacks when MASTER_MODE=no