Revert 5671519..95f1c8b

This rolls back to commit 56715195f8bb7ff85ec125dd5a4cb26e04967de8.