revert these changes, as it breaks auto-scaling under certain conditions