Remove a workaround. Note that this removal is incomplete. Based on patch by leper. This was SVN commit r18687.