Revert e7cb80e..63cc343

This rolls back to commit e7cb80ed89036be108d708030b4bc9053be12b1f.