Add back deleted portion that slipped through the previous commit