Undo a merge mistake in pull req #5