Provide the necessary code changes to support #4587. Again, sorry @kinware for my rudeness.

My apologies will even be recorded in a commit message ;)