Reverted previous changes has they would conflict with upstream.