Revert pull request #86

This broke the support app completely, and requires too much work to roll
forward immediately.

This reverts commit 6e3f9ba43f1d961dba2d2fca34ffb6f3e9ff1f43, reversing
changes made to da08909c377b367b8d6c8aebe00d93ea96641b89.