Revert "try to avoid interlocking" - it provoked crashes

This reverts commit dce4b38cad027f7427cba69d88f2693e8b68a0c8.