Revert "I don't really know if I changed anything..."

This reverts commit d0eadad07214d3b44fcbc43780355d3f04e75d17, reversing
changes made to d0288c7694e8b3b1c876c351d5ff7384d546bfbc.