Reverting breaking changes caused by 1.53 usage.