Removed org8 bits waiting for the bugfix