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