Unrevert 61108c1b9bbf9217fbc187144ee712d1de89c38a for another 36 hours

This reverts commit 8a2a8941b2fb9aa05e5ff7eb235631f19d79819e.
2.4.16