Revert 2416de1..6f8757c

This rolls back to commit 2416de19c556f5ed38b5a4ab05065e3ddebfa1c9.
Revert 0c3e494..218e69b

This rolls back to commit 0c3e494789e1ae7f7c96f98e8b3f19fe26ec1f9b.