Temporarily reverting contam changes to avoid merge conflicts