Reverting previous commit. Further work on definition implementation will be once again off master.