Restore changes originally made in #688, which were overwritten