Performance changes and code reduction and... it's broken. Ugh.