Revert "Bug 796369 - Software button manager"

This reverts commit 53f91d634c6e6f269751be142592c358d5ce5f67.