Revert 3a098e8..d5df417

This rolls back to commit 3a098e84f11e33bbac3c9a9df0f8c42362032e49.