I'll go ahead and revert this one for you @breunigs before the merge