Revert 7888db2..3639a7e

This rolls back to commit 7888db2070ddd254064847ca1a39762df9a33a36.