This reverts commit 2123b2f418b1c8fbb86dc327b598fb11423da226, reversing changes made to 3c0b5c68ce697537a21084f9135663017474a2e1.