Removed the disabled feature - RE: #78