Implement janky proxy to emulate previous behaviour.