Revert 58113e9..db9705f

This rolls back to commit 58113e975dc87eb156f9ffbedb21acc49ca5b629.
checando bug