This reverts commit b57f41c9ffc1d20e654abcfaaadf8e4d96cea106, reversing changes made to a776d1af0095c247c7f9f1be2597b106d06a58e4.