This reverts commit b9b005f3a4. This introduced invalid access cases. Revert until I fix correctly.
b9b005f3a4