Fixed duplicate method resulting from recent 8.32 -> master merge (again after egit merge failure)