Merge "Remove an interface before more invasive changes"