Actually, I'll merge this and remove it myself, seems simpler.