Revert ea6bfa5..e539564

This rolls back to commit ea6bfa5b15b4109f9cb4d3c4dd63f432d8ee9e6b.
.