reverted to old scanner design