Revert 328ef9b..5239bce

This rolls back to commit 328ef9baac23a7c3d8dc58ff3c762ff17cad42db.