Shouldn't be if/else. This hunk should be reverted.