Revert "Add workaround for SW keyboard not opening in gcc 4.8 based builds"

This reverts commit ff9817b3ea7668c0dc981e31ec3a77bde56cf166.