Revert "Try fix Substitution for core module propal & fcicheinter"

This reverts commit d2cc39cc61dd97c3b082056902fc58f07a79cfff.
quick fix for substitution in core modules