Revert f3243b8..19a5382

This rolls back to commit f3243b8f2e4911bc151a96c54ba714529776050a.