Revert 72406b8..f51a7be

This rolls back to commit 72406b816cc7edc21784d2396c66d133fce60e53.