Merge "Properly use versioned interfaces."