Reverting as didn't work and was a hack anyway