This partially reverts commit 44ecab632212b683b559ffc4f553fcbb3b463217.

Committed a failed experiment by mistake.