Merge "Clean up providing key via old API"