Revert/optimize some changes from ed944a3c70a0bad158cd5a6ca5ce1f2e717aff5d
9 files changed