This should be reverted. After all, this PR doesn't really add support for it right now