Revert patch which caused disappearing goods.
Merge branch 'jp-devel-fixes' into pretty-cities