Revert e587181..92e57fd

This rolls back to commit e5871810d3056ee9d89ecd4299ab712858f41b3f.