Revert "Longer if statement"

This reverts commit 5dd6fb6a2fa282e93f095b94b850baf0869094e1.