Revert b68a533..6cef33c

This rolls back to commit b68a5332e4c50f4bef444363f2e2624b696ef074.