Revert previous fixes and try something else