WP-432

Revert to switch statement.