Alright. I didn't even have to use MSM or do any factory reset. Following the steps of replacing the data and engineermode folders from a dumped persist.img restored my fingerprint. Huzzah!
I did install USNF 2.1.1 after it, now I know how to fix it. It didn't break my fingerprint this time.
So for anyone that might come across this error and this post in the future, following the instructions in the video provided in that post I linked regarding dumping persist, calibrating and replacing the data and engineermode worked for me.