Clean up incorrect merge 7dcf333d