Revert fd88a14..695a3b8

This rolls back to commit fd88a143da90d67a3da2bf3fc9ee7dc6e21d6662.