Reverted a change; the original way will work better