Good point, didn't look through that enough. This file is removed and the `aggregator` uses the locking API directly.