Revert 6b62eb9..7b974a3

This rolls back to commit 6b62eb9fac31aaa891e9bbd06df8f977acdc96bd.