Revert fc06423..7243d95

This rolls back to commit fc064231bf55a4d4dea4989858af00694ad332ce.
Revert "Revert fc06423..7243d95"

This reverts commit 31a22dd22930daf77b75056f596a1302ee4c1d44.