Revert 8bda062..5fd7829

This rolls back to commit 8bda0627b5cde75edb7cf4411675ba733926d167.
Revert 5fd7829..de9eb8b

This rolls back to commit 5fd78292b6b2b70756f5a598eefdd44ae2c1f9f6.