Revert 6787e70..ea26ece

This rolls back to commit 6787e70c1125184c63e401debdd7fc76d4bb228b.