Revert b72acc4..703a0dc

This rolls back to commit b72acc4633e7375ab262259c0a01d14e5a1fb1fa.