Revert "Still more refactoring"
Revert "Still more refactoring"

This reverts commit 6fdc0e9ba60123bee2e87642043fb0ffdc88b07c [formerly 53e606d492372cacd0f1fc4bcce107f096ede485].


Former-commit-id: 1279dc4d99f75fe4840e63182a599d9c96ce94ec
Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide