Revert "Move default implementation from 1.1 to 1.0"

This reverts commit 1c0e3b7e57e2e5b1c3742a5144182ac6efc54b13.

Change-Id: Ia11585a0206c3bdf99f32f2c0a3364011d05647a
6 files changed