This refactoring work is not successful.
Revert "This refactoring work is not successful."

This reverts commit 22acc850b57ef9c194cca5485cbeba41203906cc.
Prepared for the addition of the 3D cube kernel.