f73a651461
This reverts commit5e28b6ea8c. Reverting while investigating security implications of5e28b6ewithout #15597 (which is possibly a breaking change, thus not suitable for this branch).