Revert e0a90c3..2afcc9c

This rolls back to commit e0a90c3c5b086df525e0f87c93cc37908e6895f6.