Revert 571838c..f6b81ce

This rolls back to commit 571838cc1f8457823e92e858a1f514c6e874faec.