Reverted a couple of commits

[John Darrington]

Harry reported that some recent commits had been causing him build
issues.   They don't look like very important things so I have 
reverted them.

J'