8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj

Reviewed-by: erikj, ohair