Revert 3e6c853..6c3faf0

This rolls back to commit 3e6c853a1e3519a2ce72118b6a8525ec9289aedc.