I vote for making it no-op until we need it.