Revert a recent change that caused a bug