Revert "Transmogrification update" part 1