This reverts pull request 5313 (commit 2d6e473a and 2f3db04e) The problem is that this loads the server too much.