Revert if() merge, for readability
1 file changed