Revert changes to composer.json and composer.lock

Note that this commit depends on a pull request for gitter, and is
therefore in an untestable state after reverting composer.json.
Its predecessor should be testable, however.