Revert change made for #380