Add back the previously removed functionality, or try to