Bug 982568 - Re-enable keyboard OOP