Revert c36cff3..fd71737

This rolls back to commit c36cff3015c6efe4aff3965c8bbc9f06c60b7b19.