temporarily revert to using the long commands