Revert 39468944 and fix osmlab#91 without loosing the editor choice