[BACKLOG-194] -- reverted extraction of static method for system stability