This reverts commit 292eb836860bf6dd8567fff5e239477f95100ca4. This was mistakenly reverted in my local repo and pushed to the remote repo.