Clean up after #1090