Reverting unnecessary change (related: #2199)