Refs #10487. reverted all changes to ParameterMap