Some additionnal work from #1 was made to properly restore Survey module.