Revert "Remove junk from common folder"

This reverts commit cc9ac520292ad6281e4d47e2411ac2c3c641f3f1.