MDL-37966 Assignment: put upgraded modules where the originals were