Revert "usability changes"

This reverts commit 80258c5190aa4de893c7062d435186a32281f748.