Revert "and then... finally!"

This reverts commit ff1267a2c4b462786932195a6ec8745a6312e299.