Remove some unnecessary abstraction introduced in [28191]. See #27985.

git-svn-id: https://develop.svn.wordpress.org/trunk@28194 602fd350-edb4-49c9-b593-d223f7449a82