Revert 5f175e4..a97e496

This rolls back to commit 5f175e45f2a0d917c490a0117d2f6e009d80b863.