This reverts commit 0a9f7832a326c6f243cd77f14804396421ad8e29, reversing changes made to 45190ead2a.
45190ead2a