Revert c1734a1..ae0b0ad

This rolls back to commit c1734a15d7de5d879ddee3b37f2e8770a5ec6120.