Revert "Revert "Super-Hyper-Mega-Finally V (Actually VI)""

This reverts commit cd8a0ed0c6cfa4b88363624189e7e92dd1f52770.