Refactor 1.14.