Revert "Less support"

This reverts commit 61e90cdf45cc14a43d7fc6f2a2dcd450e4df3040, reversing
changes made to 12d8c3c6ade0a7652e184497469a6c72ee6dca4b.