revert branch

This branch is being remade in two parts: the tests and the revert to
better facilitate testing and verification.
Merge topic 'variable-pull-failure' into next

d7f72d1f revert branch