Revert f4d169c..6dd92b4

This rolls back to commit f4d169c6b55594cf8cd1ea4300aab39abbb5f61b.