Revert 40860cb..ebb0e0b

This rolls back to commit 40860cbeda0eccba1968c10ec4ccf5193d15ba73.
Revert ebb0e0b..f930a49

This rolls back to commit ebb0e0b156431782944afcf5f3d6ce9341d8140e.
Update