Revert 26961f7..9cddf3a

This rolls back to commit 26961f7da3ccdd1139953c20115ed70cba86242e.