Revert "Update from WordPress Core"

This reverts commit 265897bb908baf3ce4e765c646539c1ec7d44269.