Revert "software"

This reverts commit 6bfb1522398635eb1efc3e3d813adb777192c6a9.