Revert "Revert "vatcommit""

This reverts commit 785ae14b56c1f8dd7a6e022ef40657d67c53e4f8.