This reverts commit c2fc96be71. The RW-lock usage had a bug, which will be fixed in a follow up patch.
c2fc96be71