Revert db5caae..e5dcf79

This rolls back to commit db5caaea6c9ffdfc2512499c2f451af63e55a67c.
Revert 71dc7ed..2068fba

This rolls back to commit 71dc7ed3693220035f8961aba507b999f8e63ab8.