Revert dd25eec..3b05f78

This rolls back to commit dd25eec22c5c8868368b3902616a8eee96cd3e64.