Revert "Revert "Remake""

This reverts commit 440bedf5c7d0e72babd0d76653924b8b8c529489.