This reverts commit f13d8a990a927f5983442ffce00ff009cdc0e8ab, reversing changes made to cb3ba256b7b27e424616d7bc67b73385fef55be8.