/me wonders how this ever compiled before ...