This reverts commit 7d7e130af3f901ba520affc2e630bf8afaf8bc91, reversing changes made to 3639416d578573afcaba5d92bed516cd497b4295.