This reverts commit b7417003eb6a6d9197e5e0e3a1d04b70e88b3311, reversing changes made to b51a11c8edd0c91149bea26cc53408e58af19514.