Revert "Minor cleanup of code to enable access from the host"

This reverts commit edd0e9cea6b2809d5cfe9134a92c24d5f7a0290b.