Revert "Better fix"

This reverts commit e7b845092720b72d0407eda37c4d4f3c57161214.
Align with 1.0.x