This reverts commit 6b794cbf74. This caused too many merge conflicts when merging from upstream glitch, and was not a very well-implemented feature to begin with.
6b794cbf74
