Revert efd303a..dfdbd20

This rolls back to commit efd303a42248472ce92caf0c12b437dd510742e6.