This reverts commit 1137927bd7a8df83b9e9729d71d8cd7e64c8c719. Superceded by commit f1b5a80ae90762c45dd661df7cd18f7155616d29