Revert deb1cd5..3e86433

This rolls back to commit deb1cd5c144b76a05d56257510f12cf9130a093d.
convert to using Timer