Revert c846590..a5fa38e

This rolls back to commit c846590a46440949a5c1b505ea9af43ef7de7462.