This reverts commit 07e2232847baa634b7d09bdb87dafda6c6bcc4a4, reversing changes made to 37cf470ae9.
37cf470ae9