Revert "Merge"

Reverts acidvertigo/oscommerce2#117