Reverted to non-scaletype version