Revert 87c5eb3..7378344

This rolls back to commit 87c5eb3fd15701c087195ba462a5d9d756adbe7e.