This reverts commit 007820b7c119d4cdb6d1a5bfb2d695ebc532bd5e. (I only meant to revert that in my local branch)