Revert back to original code for parity with Omar's version - specs still pass