Revert aa69cac..e2efc2f

This rolls back to commit aa69cac9ed37fdce59a81ada0bc2b340c94af611.