Revert c989cc8..a00cdce

This rolls back to commit c989cc86b2365a3c126657ddb98a19700ec8f182.