Revert 82dd35c..663325e

This rolls back to commit 82dd35c1a99d5ae3cc4bb36259474b394e65a08a.