This reverts commit 5bea802525381f931a5e0f8b8778fe27a12f03af, reversing changes made to cee3524e85161e13689d95f66bc6bff994d2cdfd.