Revert "Fixed math expression syntax."

This reverts commit 301e639acccb7c9182cf300448f3454d75fdc7cc

Change-Id: Id7067e09be666c0f60c17ff57a23c5794ca4435b
Merge "Revert "Fixed math expression syntax."" into production