Reverted to old version, prev changes broke usability