This reverts commit 3097a5583d8f1e2ba01899f60b14870e72492131, reversing changes made to 523bc9c8610670cb6932a1d69c4681a28ac56235.