This was part of Rick's patch.