This reverts commit 0f2af1edfd493d28a399e64e91f54913b8547e8f, reversing changes made to 90220323f3.
90220323f3