Revert 57dbbb4..24f5d67

This rolls back to commit 57dbbb45be7cf5a4ed0e0fbfa4809316f4d383bf.