Fix for PREST internal_timestamp not set

*Note: Looks like prior merge requests went un-merged, so this latest one comes with those as baggage.