reverting back to 1.1.5 (mostly)