Revert "Tweak to make it auto merge"

This reverts commit 7ceb7a78e7c421f8ed9dd595eee92b5c829edd11.
Revert "Another tweak"

This reverts commit 138b2472349bc98e4e906183ac9a8f7c31c24b8a.