This reverts commit 4f3b092c. Reverting the previous commit as Steve wants to handle those changes, as part of a bigger reshuffling.