Revert afd0df2..3da9ee4

This rolls back to commit afd0df2fe8a8e1e57b6e122c6bd282b71518fa12.