This reverts commit 6617f5ca9e. The old situation was definitely better. Sorry for waiting so long for the revert.
6617f5ca9e