Revert c3f06af..e7849f3

This rolls back to commit c3f06af853f6762bbf374764aa04ceb33d9c813b.