Cherry picked commit that was removed #34