- Clean up PR #1163