Aaargh, reverting accidental self-merge