Reverting fix for #2434, as it broke #1514.