Revert "Revert "Revert "inlinesave 2.21"""

This reverts commit eca2bdb846825456abe48e1fdec4bbb76727bd34.