Revert "Land #945" This reverts commit c1b61a769d1b28d9309e5463e7b5abb65d460cba, reversing changes made to 194a4a5fd45fab5967878296d575644789bcafb9.