Switch to using CURRENT_SCHEMA as the default