rolled back inlining because of bugs