BZ-12041 restore to functional