Revert "Yet another potential bugfix"

This reverts commit 88adfd06ba051afa515293a4baaebf8e0b40bbd5.