Revert "// follwup https://github.com/PrestaShop/PrestaShop/commit/8d5c585319db09de1a4eeeb7e2ad3d9ac58133b3"

This reverts commit 4b280dcad5cd7bc8bfa2b6981daf3e8cc881111c.
Revert "// follow up https://github.com/PrestaShop/PrestaShop/pull/2181, thanks @djbuch"

This reverts commit 8d5c585319db09de1a4eeeb7e2ad3d9ac58133b3.
// follow up #2181
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6