This is potentially very disruptive and should go in a separate pull request