Revert 46097a7..f0afaec

This rolls back to commit 46097a7f776e3deefdbe5a29c09362bcf99f18eb.