Revert^2 "Move default implementation from 1.1 to 1.0"

94992158c9242a74dd8bdea17468db2d451711ca

Change-Id: I6f52d0e49c3a6c362a7333adfe07a0103943e456
6 files changed