Back to the original, now that we've debugged enough