Revert "Simplify the commands at startup time."

This reverts commit 7931fdd17ba038d07e40a90abce35ba660b0822e.