Revert 09b6c4b..0d21911

This rolls back to commit 09b6c4be2aedde6d16a74c15d41b0b0ac207aea3.
Let's fix that bug.