This is now handled in the Engine.