am 935fd37d: Revert "Squashed commit of the following:"

Merge commit '935fd37d27804539b141fa074c060d2c15524424'

* commit '935fd37d27804539b141fa074c060d2c15524424':
  Revert "Squashed commit of the following:"