Revert 9b1cde8..d7f96f4

This rolls back to commit 9b1cde8df4dcefc0e4d31819c897040fbe99f639.