restored original inlining method; yesterday's was too restrictive