Reverts previous commit -- previous changes were not beneficial