This reverts commit 81f2fad880a7377f40b831ab75d55a08855f3017, reversing changes made to 333bc1f9cba6c5c2e66db309dd83a5774d1ec90e.