so just remove this commented out code if that workaround's not needed.