Reverting an experimenatal change (Issue #16).