(#4506) Revert e161cbc, which causes 'undefined allocator for Proc' errors