Revert b7776ee..c2eaf93

This rolls back to commit b7776eee8c0e603b5a1968d35da66372347595b5.