Revert 1ec239f..e86e70c

This rolls back to commit 1ec239ff247b2fad9f31cb08984e03e0d13ef57f.