Revert faf8418..2cd1b2b

This rolls back to commit faf8418ec4baa666394f0a30b5fac2294c6066ab.