These efforts lead nowhere. The problem needed to be solved at the root.

This reverts commit 05e79574.
This reverts commit b02c7843.