confirmed that #4129 is fixed. removed todo