Revert 7cb45f4..f4359bd

This rolls back to commit 7cb45f4abe468fe3b4e94c919f1e6985e1a9d5e7.
Revert f4359bd..55f1890

This rolls back to commit f4359bd40b0e722be9e91b9bcb017066819a159c.