Rollback to a less wordy, yet working solution