Workaround no longer needed