Revert "I introduced a bug"

This reverts commit 3fb67ad5e3b047dc45b3eefcd7657cd4b53b0b2e.