Reverted bugfix for #472 branch