Revert d4d48fb..c38a9b5

This rolls back to commit d4d48fb35f79c09faec29b57e560ababf0bd62ae.