See if we can do the same thing without using internal API