Revert fd53fdc..a9682ff

This rolls back to commit fd53fdc94671db2c40557b322a0a22deee4dd6bf.