Revert a2e7ca4..4eb9b81

This rolls back to commit a2e7ca4c5a6d1628a4d2175a7ba9874b3293415e.