Revert "Split commit (1/2)"

This reverts commit 0dc37932a1d67712b8e95c92744d2aad4691a2cd.