Revert db91484..f60b776

This rolls back to commit db91484c07c6e3546300dbabdb6db878a9d09d45.
Revert f60b776..2e1ce3e

This rolls back to commit f60b77656ff2cd2be83050c0507a07b9b0395c95.