Revert broken merge until fixed.