The conversion to dwelling units of non-residential buildings erected prior to December 31, 1990, or portions thereof, shall be permitted subject to the provisions applicable to Commercial Districts in Article I, Chapter 5 (Residential Conversion within Existing Buildings), except as superseded or modified by the provisions of this Chapter.