Mostly reverting change Ifb9a287e since it isn't rendering correctly

For Chrome and Safari

Change-Id: I954a33a1a218d2b6f3996a78d9c244ca6b57042a