Removed locking, which is at the wrong level here.