Get rid of onReady listener (related to pull #11495)