A better fix for tiles compilation.

TODO: read commits better before fixing things.

This reverts commit 6194f101fb88b95f585f52e641675279fb840684.