Fix #16645

Fix #16645

Since the interactive stuff did not pan out this reverts us to the heredoc, granted the heredoc is now more compact and should be a little faster