Updated to reflect MATH-1120 changes as of 18-Jun

Please refer : https://issues.apache.org/jira/browse/MATH-1120?focusedCommentId=14036080&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14036080