Revert a98150d..a7eb617

This rolls back to commit a98150dac7e090682c34b174170565ca472f0525.