Revert ca46fac..200a1a9

This rolls back to commit ca46fac2c5e5eb32f7b89b7e19c5a6c2100109db.