Unintended side effects in recent versions, this patch has likely outlived its usefulness. Closes GH-452