Take a slightly different approach to addressing #204.

@airdrummningfool can you please take a look at this branch and confirm it works for you?