remove rebar hacks altogether