No dice... reverting a9c7aef3d5