Revert last changes until dns update kicks in