Restored more stuff, which were removed in 00bf811, see a83c6f2, cb09794, #49