This reverts commit bd7a55e9e1de08f00208e641b237b1bbe7ab420f. This is not really needed, but do keep the 5s wait