Fix build crash after manual merge. #317