Revert 74c261e..ea85215

This rolls back to commit 74c261eabf6a9451a75cad784d5bf95dfcc6ae4e.