This commit revert the change of 551719a8 forward ported in ed0233fb. The file and feature modified is not present after saas-11.