This reverts commit 59b9bd70b8. Might not be so ingenious. Can't get this to work anymore...
59b9bd70b8