Removing duplicate method definitions due to previous cherry-pick