Temporarily revert r135528 which distinguishes between two copies of one