Revert "Revert "Bug #8 fix tile reorder""

This reverts commit 2437b9866f8c6f494206c16d532dec87bb018aee.