Merge "Revert "Yet another interface that should be oneway.""