Revert 7b13817..e338f1d

This rolls back to commit 7b13817ad4fbd7894587489237a93db25b525df7.