Fixes Issue: PSCSX-2562

See http://forge.prestashop.com/browse/PSCSX-2562
Fixes Issue: PSCSX-2562

See http://forge.prestashop.com/browse/PSCSX-2562
Fixes Issue: PSCSX-2562

See http://forge.prestashop.com/browse/PSCSX-2562
Revert "Fixes Issue: PSCSX-2562"

This reverts commit d80e66a970ce27d1321e5434cf39fcbd17d6a366.