Remove workaround that's no longer needed.