Revert part of 81dffd5ab it causes a 5 min delay before the BE would go idle