Revert dd3cdfa..c55806b

This rolls back to commit dd3cdfa1fe9b0f96d5abee5d37d77b0bbf67aaa5.
Revert 2b3a7f3..55e2177

This rolls back to commit 2b3a7f3a73a2bf4ac7cf0fcc507390f2b36fba7d.