Commit prior to 1.2 changes