This reverts commit 5fa5c034110c3c942d299c8fd440297c89aca037, reversing changes made to 06374c64ba00977a4f720a44108593fc43d5c787.