Reverted some places where current conting functionality had been removed, because it was causing errors