Revert 1f7ea80..67cd880

This rolls back to commit 1f7ea80c23aad6d30140891e358babfc05fa2f82.