Fixed build error caused by faulty merge.