Revert "|#999|+Vinay| Fixing externalizations."

This reverts commit bb33b2d984007d04ac26c474f1aa7dfe4fc49a68.