Revert 22de000..f771b38

This rolls back to commit 22de000e613312ea7cf9ecdb76bb7284b225c189.