Bug 942790 - Re-enable keyboard oop +shepherd

Simply reverting 9531af4