Revert f81b45e..25a4801

This rolls back to commit f81b45e426d150139ea6621a70742a30b624cd36.