Bringing back the old code, this clearly didn't work, while the original code did.