Revert "Commit Merge"

This reverts commit 80e1e9cb12c8a0e1ff7f34558641eb724c93288d, reversing
changes made to 1b408f2e4ba6cf70042d5e783edf57954b9a74fb.