re-enable commented code now that compiler bugs are fixed