Re-enabled housekeeping