Revert "Doesn't work"

This reverts commit b1776c87b1e98c8c81fecd3ca5678641108f4c27.