Removing explicit dependency on Thor 0.16.*