Revert f7db814..0f48c15

This rolls back to commit f7db814c9aebaceb5223fc6cc8f596a80a277bbf.