Revert "Branch to handle the bug where compiler hangs"

This reverts commit fffb0ceec2875f72e7fd884c94ba9fdf5013d84d.