Revert "#4123 invariant values"

This reverts commit 89c29494e14de830fb89864a7cc3f57b4fc55fa7.