Re-add changes that were overwritten by dfc2049