Revert/optimize some changes from 48a2baf0e288accd206f5da5031d29076e130792
9 files changed