This is effectively a revert of 4e3339d4d194bc93b39a66e69cca056e7edcf476 The documentation links to this and so it is necessary until we can decouple it.
