Revert "Revert 7b14cc5..070e2d6"

This reverts commit 02765eafb6f800fb65f7e73d888d02cabd6ebe5d.
Revert 7b14cc5..8c41f8a

This rolls back to commit 7b14cc56d372503342f0cd927f7035c955220632.