Ooops - revert a few bits

Included some bits in the last commit that shouldn't have been in
there...