Remove a workaround that doesn't seem needed anymore.