2.1.8 tweaks
Revert "2.1.8 tweaks"

This reverts commit 55cb33e5900905b2cc2e5aac41ef933cedc09944.
2.1.8 Tweaks
2.1.8 tweaks