Re-enable hack for Issue #50.