Reverted pointer changes. Thanks, Mister King