revert 9ba5119c8cd3d663e554d7715210223bd5c73425, breaks tiles edition.