Revert 43c7e65..512ff83

This rolls back to commit 43c7e65426b0aa2c024c5f9310453127a98afcfc.
Revert "Revert 43c7e65..512ff83"

This reverts commit f28c80017df74efcb13ff272e76ea37255599a69.
Revert 43c7e65..6b54c02

This rolls back to commit 43c7e65426b0aa2c024c5f9310453127a98afcfc.