Revert "Variation on 2048"

This reverts commit eed0d2f5f32c46e3a437080f46aa35b2c4a14fc6.
Revert "Revert "Variation on 2048""

This reverts commit 4a065bab2f390d3af30d143a1da097a02e8fe939.