[chirp_devel] revert #4687