Less code same shiz
Revert "Less code same shiz"

This reverts commit 5542dd0679be05fb17fd4e02a7c26e6abf053c76.