I'm removing this workaround too.

BTW, neither of these were in #59 ... they were accidentally picked up by me because I did a complete diff :) ... we are this close to unforking. \o/