Revert dfca679..a471a09

This rolls back to commit dfca679b092214595f555882d8ee4fed79c608aa.