Temporarily reverting head for release

Revert "Added another edge case we need to handle"

This reverts commit 9694f0b6d85eb88e4154ac35fcbdf6d356fd9f61.