This reverts commit f14a4d60b74625547ba7fc0572e42e9b61c0e54f, and thus applying 558af6fbc7c15f472658339668113f4d5c6440e0.