Fix a bad bug with uniform variables and revert some changes done for testing.