We need to make sure we don't forget about this change when we switch over to using this fork.