Revert "More function inlining"

This reverts commit 99fb662ae8af708d58a4cdd4c27cd52324256d91.