EXPERIMENTAL: Get rid of dirty workaround in ADMANY
It should work from now on