Confirmation - tablespace_sql wasn't actually used here at all even before your changes?