Revert "fix attempt 3"

This reverts commit 99607290c912830e032dc2efda30a8953097901f.
Final fix attempt