Restored iOS8 keyboard logic ... again