[TASK] Revert commit #71