Reverting Math to known-good 2b8534793fad9db18fcdb9621dc8d79ff36fdeb1

Change-Id: I5ba48ca512e1665b9e6f299055190df140839ca0