FL-721: fix erroneus commit, avoid circular dep