Un-apply patch from http://pkp.sfu.ca/bugzilla/show_bug.cgi?id=6762