4da9e78de1
This partially reverts commit 79624b72e5
The change breaks existing binaries for sub record functions.
Re-apply when upgrading to 7.0.10