Revert "inlinesave 2.21"

This reverts commit 53593681c52492c26674bd82e1e5b0b5b0f797fb.
Revert "Revert "inlinesave 2.21""

This reverts commit 37081307a7f531ed9798f9098e4bc85b91c36db0.