Restore desired changes that were reverted in 24b0ec8ceb474b56beea521820ff3f62d47db934