67bc353e6d
This reverts commit dcbb1ca54aae57fadd220b269cd4907f89085ca4. Dropping this for now to maintain compatibility for 0.3.1. Change-Id: I44e032a072d317bb67e1439c42cff923e603038f