Killed this as under express it causes tests to hang weirdly.