Revert "merged branch stloyd/feature/kernel_secret_change (PR #6598)"

This reverts commit dbca0403b878049a9b061e25172a6dcf0fcf9933, reversing
changes made to 1e6258846a3dca63cf079159ab044accb3dfc5c5.