Revert 6fadea6..5da302a

This rolls back to commit 6fadea64446909ffb6741bc14254388e7762b74c.