[12764] Reverted last commit