Revert 2cd65b3..e2689b1

This rolls back to commit 2cd65b3781f024001cbc4b806a680ccfe84f402c.