Remove hack put in place for #12512