Issue 19135 Don't need these any more.