This reverts commit ed1ad0566f8c73d8855f66051e4c00818c52aab7, reversing changes made to 6ee909914d7aca7c88d8247417d8c9b4ef033c79.