Revert c1961f6..e039be6

This rolls back to commit c1961f6660a1175e53f89ff7e72cd2197ed69c3c.