Revert c19df08..eec52d2

This rolls back to commit c19df087f33366bbdba8590459ae6b25dfc8625d.