Revert d2ca81a..d5f4db7

This rolls back to commit d2ca81a95fbfebbf3669ae2b1bec8264297bf15d.