Revert "1.8 capability"

This reverts commit 3df22d0a1ad13099075f830d720a5b583bc969e0.