integrated resolution of https://github.com/square/cubism/pull/32