Revert "Fix annoying errors"

This reverts commit 1ea28578b3017b0d9c59614b565066b5d6ec826b.