Previously part of #468
Previously part of #468