Revert the temporary workaround for bug #162