Revert 992c7bb..90472ef

This rolls back to commit 992c7bb95beb4b3969dfbb3460846e88c1948d01.
Revert 5329fa0..091b183

This rolls back to commit 5329fa0bf71564222ade9989b33e62c1f9cae54c.
n