Include patch from Miko O'Sullivan <miko@idocs.com> to help run under taint mode.