revert api clutter from r18995