Revert to original database recipe
Merged from Chin's master templated