Revert "Auto collapse: remove null function"

This reverts commit 5a0f95fd6f0c1db79cad6b9a6463dafbddd97d1d.