Don't like this. Seem to be reverting changes in hypersocket-core to fix issues so breaking others at the same time.