Reverting commit c319e84523fb6e803df9cc87be27bf16589ab4f9 until 2.8.2 release