Revert d36f22a..5bf8f87

This rolls back to commit d36f22a0c554911bf37e1a487a24966f970555d7.