Revert "[Improve] Relax restrictions on issue 6538 and 9361"

This reverts commit f6d861b2bb083812f24b43d2d50c70222626b039.