This reverts commit 2dc5b4fd8f23ebb277349fffd2e24282d0cc0cc4, reversing changes made to dea0a547a6750036fa2eaebf21cccac01a66c759.