Reverted a24638687f5372a0789156492ae9e8781c373d64
Reverted a24638687f5372a0789156492ae9e8781c373d64

Reverted commit a24638687f5372a0789156492ae9e8781c373d64 because of
functionality breaking.

charsleysa/zero