Revert 8d2343b..d98da9a

This rolls back to commit 8d2343bb8aa680274961259bb40c06393d7bc740.
Revert d98da9a..5556233

This rolls back to commit d98da9a9012df18cdec933b92dfafdf7a903d6be.