Remove temp fix
Merge pull request #971 from geoadmin/dev_remove_temp_fix

Remove temp fix