Revert fede9a8..595b360

This rolls back to commit fede9a8b8c5b1c39a9483fbbef9440136e1d3cd8.
Revert a65dde4..2b19b29

This rolls back to commit a65dde4b1715361c152ff9133ff3ed14f03e3b8c.