Still dealing with borked scope_guard commit