Revert c86edd9..8c3f945

This rolls back to commit c86edd95c16069a9648fe98255114f746d06ff9b.