Revert "And I'll take this."

This reverts commit 21fd80f5d5156d161d6d24e8da6605ed87f0405e.