Revert 9e69504..05d7d89

This rolls back to commit 9e69504f762c8eb150dfa9d8ee9ebd907309c5ca.