Revert 628caa1..8895ee2

This rolls back to commit 628caa1514dd9db33990ac003a5125c46081a8ad.
Revert 075546c..7109ec3

This rolls back to commit 075546ca9257b24384ce4f7919add352adaa0780.