Revert to 7239dfe
Simon's changes