Partially revert r59884 because of an enum name collision (which broke build).