Revert 02986aa..de44801

This rolls back to commit 02986aa1021f89a67ff95706930751a075986676.