Partial revert for merging.