This reverts commit 113234816ec19bc585116c55ceedca86cd865748, reversing changes made to 51ff2484703c5a0d13f47df3fd381a63ce5c98b8.