Fixed accidentally reverted change in the last merge.