This patch seems to introduce bugs on aarch64. Reverting while we investigate the root cause. This reverts commit 02841488.