Revert fb0c9fb..450bf65

This rolls back to commit fb0c9fbe1398f128b48ac93eb6eecbc5640e2310.