Revert 86c573a..5ee26c1

This rolls back to commit 86c573a56cf2053840487a4a90c9292b07d3d248.