CCBUG: 406292
Before:
After:
Depends on frameworks/kio!431 (merged), otherwise the schemes will be different.