Revert cbf7cfc commit.
Fixed WorldMap taint error.