FIXED: revert work on with-eval-after-load v1.5.8