This reverts commit 8d5f64c4. Thanks to Eli Friedma for pointing out that this check is not appropiate here, this check will be moved to the Lint pass.