Revert d4eaa3f..6fc868e

This rolls back to commit d4eaa3fa340d042599455ccd75898d6375a7bde2.
Revert "Revert d4eaa3f..6fc868e"

This reverts commit f0e0ccd81b294934fa8eccafa6ff5782102c172e.