Revert b1bb96f..add2f2f

This rolls back to commit b1bb96fab78475f1916f8fc6fb02706a8498c106.