Ticket/stable/pup 3244 revert

This reverts the merge from two PRs that stepped on each other a bit.