Revert "Multiply updates"

This reverts commit e052fbe45f5814f6cf1bdca70e69bd90a7a99673.

Change-Id: I0e14869604529cabc9548bfbecc31b3159b35a9b
8 files changed