Reverted previous hackish fix.