Revert a88cd3d..f6742d1

This rolls back to commit a88cd3df21a2fefadf80c0ce4fcf885d8d43b476.