Revert "EXTREMELY UNSTABLE UNTESTED..."

This reverts commit 7a50a204151e502d5302d68e5140d8cb654e9a3b.