Revert e98e0c3..518deaa

This rolls back to commit e98e0c312d8f541db7b591f53d3cc7ff4a29b743.