Remove hack since we discovered the existence of default values