Changed to match updates in Common.