revert commit 8c01cbaf04ef1b41118acf2a307adec3c736491d which causes a crash in backend