Revert c324453..cce3b3e

This rolls back to commit c32445305358594d33d2c9a079af4780a3453094.