Revert "AE: All your locks belong to us" - Let's not fix bad design by locking the hell out of it

This reverts commit ee30b8e93f06d3c8170139189188b4c10e31ca56.