Merge "Revert^2 "Fix signature of recently changed methods""