Too much reverts

This reverts commit f501126310428cdf6ae88874a308e5dc93d9c164.