Re-AOSP-ify id synchronization

Revert "Fix synchronization when preparing ids."

If it ain't broke, don't enforce excessive mutual exclusion.

This reverts commit ddfbe106bb9c2b6c51ec1d9bc4070710cba65582.

Change-Id: If58ba87c3a721119970c64a9859ae7b806f22ee6