adding back changes lost during derpy merge conflict resolution

Last one for today, I promise. :/