Revert "Rework fix for previous bug"

This reverts commit 7b318e66e326bc7c3c08cb7f3489784191f4205d.