Revert hot fix in main. On dev should work the version without this
change. The correct implementation will be done on backend later on.