This is more code to maintain. Do we need to keep it around?