Revert b8e16ce..e7acad4

This rolls back to commit b8e16ceff37a3a36696d45ff99d48d29c2433884.