Revert "Simplification."

This reverts commit 5182f1c28e24a2cbb19efaba3b04f766f83dbcd1.