Un-delete Neil's changes after bad merge

Sorry Neil......