Revert 86b1294..30060b2

This rolls back to commit 86b1294393a93400c3432a5df8596abb7b170810.