Revert 9235bab..f16c52e

This rolls back to commit 9235babe041932dda8178447f0a1a3606cf97520.
v7