I'll revert this for now since we're using `@synchronized`