Because phase I is a quick fix to stop the build from breaking when I push your SI PR; it will only live for a few hours.

Phase II (moving to module common) is more involved and it will be addressed properly there.