Revert 079ebe8..06c73b6

This rolls back to commit 079ebe83f35fb5fa9583cbc92499721bd0866717.
transition