Undo 2 year changes

Finally got round to removing this.