Revert 37ced7b..f6887e1

This rolls back to commit 37ced7b42ec9c81f01584a281dd2f38cad87baef.
Revert f6887e1..30cc7bb

This rolls back to commit f6887e178f47f2141e83cf350d6dc9524c4f1ce9.