revert change 1.13 entirely due to incorrect behavior