Revert 8173965..775e9d1

This rolls back to commit 81739657fc206ca58208dc0d73e6e75a32f7e953.
Rollback