Revert 6c34a20..a65986a

This rolls back to commit 6c34a206ff31cf0dce702a231310beca1f86ce3d.