Restoring STC Through Proper Firestopping