Revert - see comments.