Partially revert "Fix L&F on API 10."

This reverts commit e41d947cea81e1928d69a312179cc0f46d4f95b8.
v0.3