Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 26589d2fccf1fbec8d28d84d85c5649461e6037f, reversing
changes made to 30ceb37a597ccd1f1807e426afc674c3081b101f.
Revert "Fixed sorts"

This reverts commit 30ceb37a597ccd1f1807e426afc674c3081b101f.