Added non-decorator version.