Fix for nightly

Fix for rustc 0.13.0-nightly (d91a015ab 2014-11-14 23:37:27 +0000)
Fix is just a revert of 75ef6da668c07305ad74c29a30ea80b8a11aa84e .... :-/