Revert 810ce62..09628ff

This rolls back to commit 810ce62bdf947eb9780dd693988c90259904f2d8.