It looks like this effectively undoes Josh's fix in PR #153.