Revert to maybe fix compile error