Restore and deprecate constructor variants mistakenly removed in commit ...

...dc13dc9

These may get removed in 9, but I'd rather that happen separately. This commit will be backported to EAP.