Revert 333ebb5..c36e236

This rolls back to commit 333ebb5995659ad759f28228d6b3f6fd4f02ef97.