Revert "sync with floss"

This reverts commit 3c9d30a9fb31a2c70fd4aac0ff05c4dd38bd3bdb.