Revert 13ea158..68a35d3

This rolls back to commit 13ea1587e165c2735ac5dd41b11e35cda3a27b82.