Revert df03823..9d4606e

This rolls back to commit df03823bff3900323ba667d9828407857fa84315.