Revert fb0a590..1624af5

This rolls back to commit fb0a590ab65a05a19a43e5e9a24d4ec052f6cdae.