Reinstated usage changes which were accidentally reverted