Accidentally committed code that was not fully merged.