Back out unicorn in favor of simplicity