Partial revert of 14531625

Which seems to cause errors here.