Commit these changes to switch back

Switch back to the non-process-oriented approach.