Revert "The canvas team requested all canvas models be changed."

This reverts commit b1364af837cb35ff94f6cc06c6ec0aef6d3c8927.