Please see individual patches for details.
/cc @jhuge, @lu.xu, @xavier_thompson, @Daetalus
This will create a new commit in order to revert the existing changes.
