Reverted to version before a botched merge.