Revereted a change until the correct pointer has been implemented