Revert commit 08e38ceba2d2c08da1b8ab0d45b13a31ce0a5437 (avoid potential crashes)