Revert deaafda..a43a56b

This rolls back to commit deaafdaf9ed98d109712ec10cdd3f81080a0b110.
Revert a43a56b..0f284d6

This rolls back to commit a43a56b2b7cb7879906f91ea438922779d13be2e.