Back out some accidentally-committed error logging