Revert "Merge branch 'extension/speed-up' into 'main'"

The latest merge of the 'extension/speed-up' branch caused the main version to stop working. This revert is necessary to restore the stable state of the project while we investigate the issue.This reverts merge request !1 (merged)