Reversing a change that has introduced non-scrolling behavior when the keyboard appears.

This is just a quick fix to get a build out.  Need to get a better understanding of the problem and file an issue against the original project.