Revert "Time for a revamp"

This reverts commit 521f5868da12731d9c342ec99e35ab76e23a666e.