Revert 8496a13..e7e9053

This rolls back to commit 8496a131d10fbfdb71c66389dc24e88ce7f9e77b.