Revert bea6f14..b482969

This rolls back to commit bea6f147a1bab2c4e71b2b5b6bf1c62f53ed8f99.