Revert aa0adc2..c7aa046

This rolls back to commit aa0adc2e72920160299b87c9886c2b455ea19d55.