Remove hack from @b77b35138050b402f3634c8e15a8b4a30359ccc0