Rolling back a change that broke 5.4. Can't use finally yet.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>