a3e5bc4fb5
This fix only removes the dependency on compile time constants. The code has other (old) problems that need to be addressed. PR: 1791 Reviewed-by: bde, tegge